Use the perl found by configure. (#149826, Morten Welinder)

2004-11-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/Makefile.am (gtkalias.h):
	* gdk/Makefile.am (gdkalias.h): Use the perl found by
	configure.  (#149826, Morten Welinder)

diff --git a/ChangeLog b/ChangeLog
index 07376c7cdb0503a73f4dce7095ea362a58e87ae2..ebc332903406158a5c24bc59b4d710bfb5c71666 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/Makefile.am (gtkalias.h): 
+       * gdk/Makefile.am (gdkalias.h): Use the perl found by 
+       configure.  (#149826, Morten Welinder)
+
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwidget.h (gtk_requisition_get_type): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 07376c7cdb0503a73f4dce7095ea362a58e87ae2..ebc332903406158a5c24bc59b4d710bfb5c71666 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/Makefile.am (gtkalias.h): 
+       * gdk/Makefile.am (gdkalias.h): Use the perl found by 
+       configure.  (#149826, Morten Welinder)
+
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwidget.h (gtk_requisition_get_type): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 07376c7cdb0503a73f4dce7095ea362a58e87ae2..ebc332903406158a5c24bc59b4d710bfb5c71666 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/Makefile.am (gtkalias.h): 
+       * gdk/Makefile.am (gdkalias.h): Use the perl found by 
+       configure.  (#149826, Morten Welinder)
+
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwidget.h (gtk_requisition_get_type): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 07376c7cdb0503a73f4dce7095ea362a58e87ae2..ebc332903406158a5c24bc59b4d710bfb5c71666 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/Makefile.am (gtkalias.h): 
+       * gdk/Makefile.am (gdkalias.h): Use the perl found by 
+       configure.  (#149826, Morten Welinder)
+
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkwidget.h (gtk_requisition_get_type): 

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index fa573386a148521eb299e8454467e89a54dc5c37..9f363bd89fd617093c5551d6c3dfe8c83925c213 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,6 +1,11 @@
+2004-11-29  Matthias Clasen  <mclasen@redhat.com>
+
+       * Makefile.am (gdk-pixbuf-alias.h): Use the perl found by 
+       configure.  (#149826, Morten Welinder)
+
 Sun Nov 28 12:11:21 2004  Manish Singh  <yosh@gimp.org>
 
-       * makegdkpixbufalias.pl: ytpo fix, so attributes are really
+       * makegdkpixbufalias.pl: Typo fix, so attributes are really
        propagated.
 
 2004-11-28  Matthias Clasen  <mclasen@redhat.com>

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index ee41f7063bb44042cff306148a223e79ccb79d4e..55ed65ba89e8dc21801bcc896ea559549506398b 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -40,10 +40,10 @@ uninstall-ms-lib:
 endif
 
 gdk_pixbuf.def: gdk-pixbuf.symbols
-       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES $(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/    /' -e 's/G_GNUC_[^ ]*//g') > gdk_pixbuf.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES $(srcdir)/gdk-pixbuf.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > gdk_pixbuf.def
 
 gdk-pixbuf-alias.h: gdk-pixbuf.symbols
-        $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h
+        $(PERL) $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h
 
 if OS_UNIX
 TESTS = abicheck.sh

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 8518c1e94b1955eb0603772a35916268f7d16a6b..8e69a3aba200c8c4c60aa19e3577126cff919c5b 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -177,10 +177,10 @@ uninstall-ms-lib:
 endif
 
 gdk.def: gdk.symbols
-       (echo -e EXPORTS; cpp -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES $(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/     /' -e 's/G_GNUC_[^ ]*//g') > gdk.def
+       (echo -e EXPORTS; $(CPP) -P -DGDK_WINDOWING_WIN32 -DINCLUDE_VARIABLES $(srcdir)/gdk.symbols | sed -e '/^$$/d' -e 's/^/  /' -e 's/G_GNUC_[^ ]*//g') > gdk.def
 
 gdkalias.h: gdk.symbols
-        $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h
+        $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e86a3302ef2e76db47ce5f92233f2e0bdf85dc9d..099043440246360514bc377ae5c5405ba43bd6f4 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -71,10 +71,10 @@ uninstall-ms-lib:
 endif
 
 gtk.def: gtk.symbols
-       (echo -e EXPORTS; cpp -P -DINCLUDE_VARIABLES -DG_OS_WIN32 $(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/      /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
+       (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DG_OS_WIN32 $(srcdir)/gtk.symbols | sed -e '/^$$/d' -e 's/^/   /' -e 's/G_GNUC_[^ ]*//g') > gtk.def
 
 gtkalias.h: gtk.symbols
-         $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
+         $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h
 
 if OS_UNIX
 TESTS = abicheck.sh